From c6ddf6e062989ec5b1c2b850b10f165ad2744a4e Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 12 Apr 2010 17:36:54 +0100 Subject: [PATCH] Fix bug in 21089:4f796e29987c Signed-off-by: Jan Beulich --- xen/arch/x86/io_apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 0b4275d03d..2c5f03d0d2 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2163,12 +2163,12 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a io_apic_write(ioapic, 0x11+2*pin, *(((int *)&entry)+1)); io_apic_write(ioapic, 0x10+2*pin, *(((int *)&entry)+0)); set_native_irq_info(irq, TARGET_CPUS); - spin_unlock_irqrestore(&ioapic_lock, flags); + spin_unlock(&ioapic_lock); spin_lock(&desc->lock); if (!(desc->status & (IRQ_DISABLED | IRQ_GUEST))) desc->handler->startup(irq); - spin_unlock(&desc->lock); + spin_unlock_irqrestore(&desc->lock, flags); return 0; } -- 2.30.2